1. Added PcdNtEmulator and Removed MACRO EFI_NT_EMULATOR

2. Updated *.fpd of all Package.


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

6 files changed, 139 insertions, 64 deletions

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index e4ce17c6f9..fe8fcd8d1c 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -2075,6 +2075,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>320</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -8022,6 +8030,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>320</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -12571,6 +12587,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>320</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -16942,6 +16966,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>320</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20987,6 +21019,14 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0x06</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -21076,6 +21116,14 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0x06</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -21165,6 +21213,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdNtEmulatorEnable</C_Name>

+          <Token>0x0001003e</Token>

+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 0cbca6d063..2e362adc8f 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8"?>

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <SpdHeader>

     <PackageName>EdkModulePkg</PackageName>

@@ -1288,5 +1288,14 @@
       <DefaultValue>TRUE</DefaultValue>

       <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>

     </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdNtEmulatorEnable</C_Name>

+      <Token>0x0001003e</Token>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>FALSE</DefaultValue>

+      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>

+    </PcdEntry>

   </PcdDeclarations>

-</PackageSurfaceArea>

+</PackageSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 5c14254a0c..6d1be7594a 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for DebugSupport module.</Abstract>

     <Description>This driver installs DebugSupport protocol for the selected processor.</Description>

     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials

-      are licensed and made available under the terms and conditions of the BSD License

-      which accompanies this distribution.  The full text of the license may be found at

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -43,6 +43,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>BaseLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

+      <Keyword>PcdLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>DebugSupport.c</Filename>

@@ -63,14 +66,14 @@
   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

     <Protocol Usage="SOMETIMES_PRODUCED">

       <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>

-      <HelpText>If the debug support protocol for this processor type is not 

-        already installed, this protocol will be installed. Otherwise, it will

-        be not installed again.

-      </HelpText>

+      <HelpText>If the debug support protocol for this processor type is not
+        already installed, this protocol will be installed. Otherwise, it will
+        be not installed again.</HelpText>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>

@@ -83,4 +86,11 @@
       <ModuleEntryPoint>InitializeDebugSupportDriver</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+  <PcdCoded>

+    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">

+      <C_Name>PcdNtEmulatorEnable</C_Name>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
index 270a158b79..88b8c5a14a 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/Ia32/plDebugSupport.c
@@ -1,14 +1,14 @@
 /**@file

   IA32 specific debug support functions

-  

-Copyright (c) 2006 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         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Copyright (c) 2006 - 2007, 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

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 IDT_ENTRY   *IdtEntryTable  = NULL;

 DESCRIPTOR  NullDesc        = 0;

 

-#ifndef EFI_NT_EMULATOR

 STATIC

 EFI_STATUS

 CreateEntryStub (

@@ -77,7 +76,7 @@ Returns:
     // fixup the jump target to point to the common entry

     //

     *(UINT32 *) &StubCopy[0x0e] = (UINT32) CommonIdtEntry - (UINT32) &StubCopy[StubSize];

-    

+

     return EFI_SUCCESS;

   }

 

@@ -158,7 +157,6 @@ Returns:
 

   return EFI_SUCCESS;

 }

-#endif

 

 EFI_STATUS

 ManageIdtEntryTable (

@@ -193,33 +191,34 @@ Returns:
 

   Status = EFI_SUCCESS;

 

-#ifndef EFI_NT_EMULATOR

-  if (CompareDescriptor (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc)) {

-    //

-    // we've already installed to this vector

-    //

-    if (NewCallback != NULL) {

+  if (FeaturePcdGet (PcdNtEmulatorEnable)) {

+    if (CompareDescriptor (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc)) {

       //

-      // if the input handler is non-null, error

+      // we've already installed to this vector

       //

-      Status = EFI_ALREADY_STARTED;

+      if (NewCallback != NULL) {

+        //

+        // if the input handler is non-null, error

+        //

+        Status = EFI_ALREADY_STARTED;

+      } else {

+        Status = UnhookEntry (ExceptionType);

+      }

     } else {

-      Status = UnhookEntry (ExceptionType);

-    }

-  } else {

-    //

-    // no user handler installed on this vector

-    //

-    if (NewCallback == NULL) {

       //

-      // if the input handler is null, error

+      // no user handler installed on this vector

       //

-      Status = EFI_INVALID_PARAMETER;

-    } else {

-      Status = HookEntry (ExceptionType, NewCallback);

+      if (NewCallback == NULL) {

+        //

+        // if the input handler is null, error

+        //

+        Status = EFI_INVALID_PARAMETER;

+      } else {

+        Status = HookEntry (ExceptionType, NewCallback);

+      }

     }

   }

-#endif

+

   return Status;

 }

 

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
index 6fb4cdb542..3f12a76d6c 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/plDebugSupport.c
@@ -1,14 +1,14 @@
 /**@file

   X64 specific debug support functions

 

-Copyright (c) 2006 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         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, 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

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

@@ -74,7 +74,7 @@ Returns:
     // fixup the jump target to point to the common entry

     //

     *(UINT32 *) &StubCopy[0x3] = (UINT32)((UINTN) CommonIdtEntry - (UINTN) &StubCopy[StubSize]);

-    

+

     return EFI_SUCCESS;

   }

 

@@ -147,7 +147,7 @@ Returns:
 --*/

 {

   BOOLEAN     OldIntFlagState;

-  

+

   OldIntFlagState = WriteInterruptFlag (0);

   WriteIdt (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));

   FreePool ((VOID *) (UINTN) IdtEntryTable[ExceptionType].StubEntry);

diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
index 3e4ef3ceeb..1aaeb648e5 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
@@ -6,14 +6,14 @@
     <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for DebugPort module.</Abstract>

-    <Description>This driver binds exclusively to serial io on the controller handle, 

+    <Description>This driver binds exclusively to serial io on the controller handle,
       and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>

     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials

-      are licensed and made available under the terms and conditions of the BSD License

-      which accompanies this distribution.  The full text of the license may be found at

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -60,12 +60,13 @@
   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

     <Protocol Usage="BY_START">

       <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>

-      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are 

-        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,

+      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are
+        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,
         which are not required to be described in the followin Guids section.</HelpText>

     </Protocol>

     <Protocol Usage="BY_START">

@@ -85,8 +86,8 @@
     <Variable Usage="SOMETIMES_CONSUMED">

       <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>

       <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>

-      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is

-       one virtual guid, which can't be described in this section. 

+      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is
+       one virtual guid, which can't be described in this section.
        So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>

     </Variable>

   </Variables>