From d8bee43ce44db3012de2274b135ede6d06106f7d Mon Sep 17 00:00:00 2001 From: eric_tian Date: Wed, 13 Aug 2008 04:53:33 +0000 Subject: [PATCH] Fix build issue in linux environment. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5636 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/BootSector/BootSector.inf | 19 ++++++++++--------- DuetPkg/CpuDxe/Cpu.inf | 4 ++-- DuetPkg/CpuIoDxe/CpuIoAccess.h | 14 ++++++-------- DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c | 12 ++++++------ DuetPkg/DataHubGenDxe/DataHubGen.h | 6 +++--- DuetPkg/DxeIpl/DxeIpl.h | 2 +- DuetPkg/Library/DuetBdsLib/BdsPlatform.c | 16 ++++++++-------- DuetPkg/Library/DuetBdsLib/BdsPlatform.h | 4 ++-- DuetPkg/Library/DuetBdsLib/PlatformBds.inf | 1 - DuetPkg/PciBusNoEnumerationDxe/PciBus.h | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciCommand.c | 2 +- .../PciBusNoEnumerationDxe/PciDeviceSupport.c | 2 +- .../PciDriverOverride.c | 2 +- .../PciBusNoEnumerationDxe/PciEnumerator.c | 2 +- .../PciBusNoEnumerationDxe/PciEnumerator.h | 2 +- .../PciEnumeratorSupport.c | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciIo.c | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciIo.h | 2 +- .../PciOptionRomSupport.h | 2 +- .../PciPowerManagement.c | 3 ++- .../PciPowerManagement.h | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c | 2 +- .../Ia32/PcatIo.c | 2 +- .../PciRootBridgeNoEnumeration.inf | 6 +++--- 24 files changed, 56 insertions(+), 57 deletions(-) diff --git a/DuetPkg/BootSector/BootSector.inf b/DuetPkg/BootSector/BootSector.inf index 166dc01e3a..156ed5d0a1 100644 --- a/DuetPkg/BootSector/BootSector.inf +++ b/DuetPkg/BootSector/BootSector.inf @@ -7,18 +7,19 @@ EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 CUSTOM_MAKEFILE = Makefile + [Packages] MdePkg/MdePkg.dec DuetPkg/DuetPkg.dec [Sources] - bootsect.asm - bs16.asm - bs32.asm - Gpt.asm - Mbr.asm - Start.asm - Start16.asm - Start32.asm - Efi32.asm + bootsect.asm | INTEL + bs16.asm | INTEL + bs32.asm | INTEL + Gpt.asm | INTEL + Mbr.asm | INTEL + start.asm | INTEL + start16.asm | INTEL + start32.asm | INTEL + efi32.asm | INTEL diff --git a/DuetPkg/CpuDxe/Cpu.inf b/DuetPkg/CpuDxe/Cpu.inf index 82c11b86fe..4cea2edcb9 100644 --- a/DuetPkg/CpuDxe/Cpu.inf +++ b/DuetPkg/CpuDxe/Cpu.inf @@ -38,10 +38,10 @@ UefiBootServicesTableLib [Sources.IA32] - IA32/CpuInterrupt.asm + Ia32/CpuInterrupt.asm | INTEL [Sources.X64] - X64/CpuInterrupt.asm + X64/CpuInterrupt.asm | INTEL [Sources.common] Cpu.c diff --git a/DuetPkg/CpuIoDxe/CpuIoAccess.h b/DuetPkg/CpuIoDxe/CpuIoAccess.h index 3983ec8f73..ec596b645f 100644 --- a/DuetPkg/CpuIoDxe/CpuIoAccess.h +++ b/DuetPkg/CpuIoDxe/CpuIoAccess.h @@ -22,10 +22,8 @@ Abstract: #define _CPU_IO_ACCESS_H -#define IA32API __cdecl - UINT8 -IA32API +EFIAPI CpuIoRead8 ( IN UINT16 Port ) @@ -55,7 +53,7 @@ Returns: Return read 8 bit value --*/ UINT16 -IA32API +EFIAPI CpuIoRead16 ( IN UINT16 Port ) @@ -85,7 +83,7 @@ Returns: Return read 16 bit value --*/ UINT32 -IA32API +EFIAPI CpuIoRead32 ( IN UINT16 Port ) @@ -115,7 +113,7 @@ Returns: Return read 32 bit value --*/ VOID -IA32API +EFIAPI CpuIoWrite8 ( IN UINT16 Port, IN UINT32 Data @@ -148,7 +146,7 @@ Returns: None --*/ VOID -IA32API +EFIAPI CpuIoWrite16 ( IN UINT16 Port, IN UINT32 Data @@ -181,7 +179,7 @@ Returns: None --*/ VOID -IA32API +EFIAPI CpuIoWrite32 ( IN UINT16 Port, IN UINT32 Data diff --git a/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c b/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c index 6c7b198d76..592eb0fdfb 100644 --- a/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c +++ b/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c @@ -45,7 +45,7 @@ #include "CpuIoAccess.h" UINT8 -IA32API +EFIAPI CpuIoRead8 ( IN UINT16 Port ) @@ -59,7 +59,7 @@ CpuIoRead8 ( } UINT16 -IA32API +EFIAPI CpuIoRead16 ( IN UINT16 Port ) @@ -73,7 +73,7 @@ CpuIoRead16 ( } UINT32 -IA32API +EFIAPI CpuIoRead32 ( IN UINT16 Port ) @@ -87,7 +87,7 @@ CpuIoRead32 ( } VOID -IA32API +EFIAPI CpuIoWrite8 ( IN UINT16 Port, IN UINT32 Data @@ -101,7 +101,7 @@ CpuIoWrite8 ( } VOID -IA32API +EFIAPI CpuIoWrite16 ( IN UINT16 Port, IN UINT32 Data @@ -115,7 +115,7 @@ CpuIoWrite16 ( } VOID -IA32API +EFIAPI CpuIoWrite32 ( IN UINT16 Port, IN UINT32 Data diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h index 4d1eb61b35..a9f52276d3 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.h +++ b/DuetPkg/DataHubGenDxe/DataHubGen.h @@ -21,14 +21,14 @@ Abstract: #define _DATA_HUB_GEN_H_ #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h index b849246891..4c93071dfe 100644 --- a/DuetPkg/DxeIpl/DxeIpl.h +++ b/DuetPkg/DxeIpl/DxeIpl.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c index c927d13eec..bf806e3615 100644 --- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c +++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c @@ -73,7 +73,7 @@ Returns: // According to UEFI Spec, we should make sure Smbios table, // ACPI table and Mps tables kept in memory of specified type // - ConvertSystemTable(TableGuidArray[Index], &Table); + ConvertSystemTable(TableGuidArray[Index], (VOID**)&Table); gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table); } } @@ -83,7 +83,7 @@ Returns: } #define EFI_LDR_MEMORY_DESCRIPTOR_GUID \ - { 0x7701d7e5, 0x7d1d, 0x4432, 0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 } + { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }} EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID; @@ -177,7 +177,7 @@ UpdateMemoryMap ( if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) { continue; } - if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000) { + if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000ULL) { continue; } if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) || @@ -557,7 +557,7 @@ Returns: Status = gBS->HandleProtocol ( DeviceHandle, &gEfiDevicePathProtocolGuid, - &DevicePath + (VOID*)&DevicePath ); if (EFI_ERROR (Status)) { return Status; @@ -655,7 +655,7 @@ GetGopDevicePath ( // Add all the child handles as possible Console Device // for (Index = 0; Index < GopHandleCount; Index++) { - Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, &TempDevicePath); + Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath); if (EFI_ERROR (Status)) { continue; } @@ -717,7 +717,7 @@ Returns: Status = gBS->HandleProtocol ( DeviceHandle, &gEfiDevicePathProtocolGuid, - &DevicePath + (VOID*)&DevicePath ); if (EFI_ERROR (Status)) { return Status; @@ -760,7 +760,7 @@ Returns: Status = gBS->HandleProtocol ( DeviceHandle, &gEfiDevicePathProtocolGuid, - &DevicePath + (VOID*)&DevicePath ); if (EFI_ERROR (Status)) { return Status; @@ -821,7 +821,7 @@ Returns: } for (Index = 0; Index < HandleCount; Index++) { - Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, &PciIo); + Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID*)&PciIo); if (EFI_ERROR (Status)) { continue; } diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h index ce2a0ba2b8..9d1a3a25d5 100644 --- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h +++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h @@ -27,7 +27,7 @@ Abstract: #include #include -#include +#include #include #include @@ -48,7 +48,7 @@ Abstract: #include #include -#include +#include #include #include #include diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf index 12d507b5d6..d92211797e 100644 --- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf +++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf @@ -38,7 +38,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Nt32Pkg/Nt32Pkg.dec DuetPkg/DuetPkg.dec [LibraryClasses] diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h index edc479ba9a..568f3ffb6b 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h @@ -204,7 +204,7 @@ extern GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusCompon extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding; extern BOOLEAN gFullEnumeration; -static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFF; +static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFFULL; static UINT64 gAllZero = 0; #include "PciIo.h" diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c index 8614ee212e..1654952d03 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" EFI_STATUS diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c index 822f41afa7..a33ce38af7 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" // // This device structure is serviced as a header. diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c index 888f37931a..3556d240ff 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "pcibus.h" +#include "PciBus.h" EFI_STATUS EFIAPI diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c index b7af4ed96f..f24a83ea99 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" EFI_STATUS PciEnumerator ( diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h index 23d40839af..3146e67b20 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h @@ -44,4 +44,4 @@ Returns: --*/ ; -#endif \ No newline at end of file +#endif diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c index 01d991df89..0b6658d61c 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" EFI_STATUS InitializePPB ( diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c index e5485dcedc..1a0937fe7e 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" // // PCI I/O Support Function Prototypes diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.h b/DuetPkg/PciBusNoEnumerationDxe/PciIo.h index 08064fae3e..559e74f90a 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.h @@ -45,4 +45,4 @@ Returns: --*/ ; -#endif \ No newline at end of file +#endif diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h index a82c4ce200..2a650d20c1 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h @@ -89,4 +89,4 @@ Returns: --*/ ; -#endif \ No newline at end of file +#endif diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c index 5c2386c4bf..20bd4a7428 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c @@ -21,9 +21,10 @@ Revision History --*/ -#include "Pcibus.h" +#include "PciBus.h" EFI_STATUS +EFIAPI ResetPowerManagementFeature ( IN PCI_IO_DEVICE *PciIoDevice ) diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h index 3b16fe8524..acbdccc6ef 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h @@ -45,4 +45,4 @@ Returns: --*/ ; -#endif \ No newline at end of file +#endif diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c index ce72176d24..15426ecd92 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c @@ -21,7 +21,7 @@ Revision History --*/ -#include "pcibus.h" +#include "PciBus.h" typedef struct { EFI_HANDLE ImageHandle; diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c index 0cbf047254..d697390fa9 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c @@ -479,7 +479,7 @@ CheckForRom ( Status = gBS->AllocatePool( EfiBootServicesData, ((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR), - &TempPciOptionRomDescriptors + (VOID*)&TempPciOptionRomDescriptors ); if (mPciOptionRomTable.PciOptionRomCount > 0) { CopyMem( diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf index fa0596db13..56bf10f624 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf @@ -52,13 +52,13 @@ DeviceIo.c [Sources.ia32] - ia32\PcatIo.c + Ia32/PcatIo.c [Sources.x64] - x64\PcatIo.c + x64/PcatIo.c [Sources.ipf] - Ipf\PcatIo.c + Ipf/PcatIo.c [Protocols] gEfiPciRootBridgeIoProtocolGuid -- 2.39.2