1. Remove #ifdef _MSC_EXTENSION_ from all source files

2. Remove #ifdef _GCC_ from all resource files
3. Remove #if 0 from all resource files
4. Remove #ifdef MDE_CPU_IPF and #ifdef MDE_CPU_EBC
5. Remove #progam from Decode.c
6. Remove #ifdef TIANO_EXTENSION_FLAG from source files
7. Remove #ifdef SUPPORT_IPV6, since code base doesn't support IPV6 at all.
8. Remove #ifdef SpecialNowaitVersion from pxe_bc_mtftp.c, since it's only used for test.


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

2 files changed, 10 insertions, 32 deletions

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
index 3b49595130..cbbc00b183 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
@@ -338,14 +338,10 @@ Returns:
 

   //

   // Force Interrupt line to "Unknown" or "No Connection"

-  // based on the PCI spec, the Interrupt line for x86 should be set as 0xFF for unknown.

   //

   PciIo = &(PciIoDevice->PciIo);

-#ifndef MDE_CPU_IPF

   Data8 = PCI_INT_LINE_UNKNOWN;

-#else

-  Data8 = 0;

-#endif

+

   PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);

 

   //

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
index c42865612a..cb7fa89749 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.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:

     decode.c

@@ -21,16 +21,6 @@ Revision history:
 // TODO: fix comment to add: Module Name: DECODE.C

 #include "Undi32.h"

 

-

-//

-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.

-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"

-// does not recognize this pragma.

-//

-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)

-#pragma data_seg("rtdata")

-#endif

-

 //

 // Global variables defined in this file

 //

@@ -1339,7 +1329,7 @@ Returns:
   }

 

   AdapterInfo               = &(UNDI32DeviceList[CdbPtr->IFnum]->NicInfo);

-  

+

   //

   // entering from older entry point

   //

@@ -1655,11 +1645,3 @@ Returns:
   PxePtr->Fudge         = (UINT8) (PxePtr->Fudge - ChkSum ((VOID *) PxePtr, PxePtr->Len));

 }

 

-//

-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.

-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"

-// does not recognize this pragma.

-//

-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)

-#pragma data_seg()

-#endif