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

2 files changed, 31 insertions, 20 deletions

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
index 094140f..56b21a3 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -1,13 +1,13 @@
 /*++

 

-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.

 

 Module Name:

 

@@ -20,11 +20,6 @@ Abstract:
 

 --*/

 

-

-#ifdef TIANO_EXTENSION_FLAG

-EFI_GUID  UnknownDeviceGuid           = UNKNOWN_DEVICE_GUID;

-#endif 

-

 EFI_GUID  mEfiWinNtThunkProtocolGuid  = EFI_WIN_NT_THUNK_PROTOCOL_GUID;

 EFI_GUID  mEfiWinNtUgaGuid            = EFI_WIN_NT_UGA_GUID;

 EFI_GUID  mEfiWinNtGopGuid            = EFI_WIN_NT_GOP_GUID;

@@ -92,19 +87,19 @@ CatPrint (
 

 Routine Description:

 

-    Concatenates a formatted unicode string to allocated pool.  

+    Concatenates a formatted unicode string to allocated pool.

     The caller must free the resulting buffer.

 

 Arguments:

 

-    Str         - Tracks the allocated pool, size in use, and 

+    Str         - Tracks the allocated pool, size in use, and

                   amount of pool allocated.

 

     fmt         - The format string

 

 Returns:

 

-    Allocated buffer with the formatted string printed in it.  

+    Allocated buffer with the formatted string printed in it.

     The caller must free the allocated buffer.   The buffer

     allocation is not packed.

 

@@ -163,7 +158,7 @@ Arguments:
 

 Returns:

 

-  If the memory for the device path is successfully allocated, then a 

+  If the memory for the device path is successfully allocated, then a

   pointer to the new device path is returned.  Otherwise, NULL is returned.

 

 --*/

@@ -434,7 +429,7 @@ DevPathExtendedAcpi (
   if (Index > Anchor) {

     CIDSTRIdx = Anchor;

   }

-  

+

   if (HIDSTRIdx == 0 && CIDSTRIdx == 0 && ExtendedAcpi->UID == 0) {

     CatPrint (Str, L"AcpiExp(");

     if ((ExtendedAcpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

@@ -1089,7 +1084,7 @@ LibDuplicateDevicePathInstance (
 

 Routine Description:

 

-  Function creates a device path data structure that identically matches the 

+  Function creates a device path data structure that identically matches the

   device path passed in.

 

 Arguments:

@@ -1098,7 +1093,7 @@ Arguments:
 

 Returns:

 

-  The new copy of DevPath is created to identically match the input.  

+  The new copy of DevPath is created to identically match the input.

   Otherwise, NULL is returned.

 

 --*/

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 269a92d..1fac2da 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -3224,6 +3224,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>

@@ -3305,6 +3313,14 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>0x80000000</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>