Fix build issue in linux environment.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5636 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
eric_tian 2008-08-13 04:53:33 +00:00
parent f4168df83f
commit d8bee43ce4
24 changed files with 56 additions and 57 deletions

View File

@ -7,18 +7,19 @@
EDK_RELEASE_VERSION = 0x00020000 EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000
CUSTOM_MAKEFILE = Makefile CUSTOM_MAKEFILE = Makefile
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
DuetPkg/DuetPkg.dec DuetPkg/DuetPkg.dec
[Sources] [Sources]
bootsect.asm bootsect.asm | INTEL
bs16.asm bs16.asm | INTEL
bs32.asm bs32.asm | INTEL
Gpt.asm Gpt.asm | INTEL
Mbr.asm Mbr.asm | INTEL
Start.asm start.asm | INTEL
Start16.asm start16.asm | INTEL
Start32.asm start32.asm | INTEL
Efi32.asm efi32.asm | INTEL

View File

@ -38,10 +38,10 @@
UefiBootServicesTableLib UefiBootServicesTableLib
[Sources.IA32] [Sources.IA32]
IA32/CpuInterrupt.asm Ia32/CpuInterrupt.asm | INTEL
[Sources.X64] [Sources.X64]
X64/CpuInterrupt.asm X64/CpuInterrupt.asm | INTEL
[Sources.common] [Sources.common]
Cpu.c Cpu.c

View File

@ -22,10 +22,8 @@ Abstract:
#define _CPU_IO_ACCESS_H #define _CPU_IO_ACCESS_H
#define IA32API __cdecl
UINT8 UINT8
IA32API EFIAPI
CpuIoRead8 ( CpuIoRead8 (
IN UINT16 Port IN UINT16 Port
) )
@ -55,7 +53,7 @@ Returns:
Return read 8 bit value Return read 8 bit value
--*/ --*/
UINT16 UINT16
IA32API EFIAPI
CpuIoRead16 ( CpuIoRead16 (
IN UINT16 Port IN UINT16 Port
) )
@ -85,7 +83,7 @@ Returns:
Return read 16 bit value Return read 16 bit value
--*/ --*/
UINT32 UINT32
IA32API EFIAPI
CpuIoRead32 ( CpuIoRead32 (
IN UINT16 Port IN UINT16 Port
) )
@ -115,7 +113,7 @@ Returns:
Return read 32 bit value Return read 32 bit value
--*/ --*/
VOID VOID
IA32API EFIAPI
CpuIoWrite8 ( CpuIoWrite8 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data
@ -148,7 +146,7 @@ Returns:
None None
--*/ --*/
VOID VOID
IA32API EFIAPI
CpuIoWrite16 ( CpuIoWrite16 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data
@ -181,7 +179,7 @@ Returns:
None None
--*/ --*/
VOID VOID
IA32API EFIAPI
CpuIoWrite32 ( CpuIoWrite32 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data

View File

@ -45,7 +45,7 @@
#include "CpuIoAccess.h" #include "CpuIoAccess.h"
UINT8 UINT8
IA32API EFIAPI
CpuIoRead8 ( CpuIoRead8 (
IN UINT16 Port IN UINT16 Port
) )
@ -59,7 +59,7 @@ CpuIoRead8 (
} }
UINT16 UINT16
IA32API EFIAPI
CpuIoRead16 ( CpuIoRead16 (
IN UINT16 Port IN UINT16 Port
) )
@ -73,7 +73,7 @@ CpuIoRead16 (
} }
UINT32 UINT32
IA32API EFIAPI
CpuIoRead32 ( CpuIoRead32 (
IN UINT16 Port IN UINT16 Port
) )
@ -87,7 +87,7 @@ CpuIoRead32 (
} }
VOID VOID
IA32API EFIAPI
CpuIoWrite8 ( CpuIoWrite8 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data
@ -101,7 +101,7 @@ CpuIoWrite8 (
} }
VOID VOID
IA32API EFIAPI
CpuIoWrite16 ( CpuIoWrite16 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data
@ -115,7 +115,7 @@ CpuIoWrite16 (
} }
VOID VOID
IA32API EFIAPI
CpuIoWrite32 ( CpuIoWrite32 (
IN UINT16 Port, IN UINT16 Port,
IN UINT32 Data IN UINT32 Data

View File

@ -21,14 +21,14 @@ Abstract:
#define _DATA_HUB_GEN_H_ #define _DATA_HUB_GEN_H_
#include <FrameworkDxe.h> #include <FrameworkDxe.h>
#include <IndustryStandard/Smbios.h> #include <IndustryStandard/SmBios.h>
#include <Guid/HobList.h> #include <Guid/HobList.h>
#include <Guid/Smbios.h> #include <Guid/SmBios.h>
#include <Guid/DataHubProducer.h> #include <Guid/DataHubProducer.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/Datahub.h> #include <Protocol/DataHub.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Protocol/HiiDatabase.h> #include <Protocol/HiiDatabase.h>

View File

@ -14,7 +14,7 @@
#include <Guid/PeiPeCoffLoader.h> #include <Guid/PeiPeCoffLoader.h>
#include <Guid/MemoryAllocationHob.h> #include <Guid/MemoryAllocationHob.h>
#include <Guid/Acpi.h> #include <Guid/Acpi.h>
#include <Guid/Smbios.h> #include <Guid/SmBios.h>
#include <Guid/Mps.h> #include <Guid/Mps.h>
#include <Guid/FlashMapHob.h> #include <Guid/FlashMapHob.h>
#include <Guid/SystemNvDataGuid.h> #include <Guid/SystemNvDataGuid.h>

View File

@ -73,7 +73,7 @@ Returns:
// According to UEFI Spec, we should make sure Smbios table, // According to UEFI Spec, we should make sure Smbios table,
// ACPI table and Mps tables kept in memory of specified type // 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); gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table);
} }
} }
@ -83,7 +83,7 @@ Returns:
} }
#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \ #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; EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;
@ -177,7 +177,7 @@ UpdateMemoryMap (
if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) { if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) {
continue; continue;
} }
if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000) { if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000ULL) {
continue; continue;
} }
if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) || if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) ||
@ -557,7 +557,7 @@ Returns:
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
DeviceHandle, DeviceHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&DevicePath (VOID*)&DevicePath
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -655,7 +655,7 @@ GetGopDevicePath (
// Add all the child handles as possible Console Device // Add all the child handles as possible Console Device
// //
for (Index = 0; Index < GopHandleCount; Index++) { 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)) { if (EFI_ERROR (Status)) {
continue; continue;
} }
@ -717,7 +717,7 @@ Returns:
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
DeviceHandle, DeviceHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&DevicePath (VOID*)&DevicePath
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -760,7 +760,7 @@ Returns:
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
DeviceHandle, DeviceHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&DevicePath (VOID*)&DevicePath
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -821,7 +821,7 @@ Returns:
} }
for (Index = 0; Index < HandleCount; Index++) { 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)) { if (EFI_ERROR (Status)) {
continue; continue;
} }

View File

@ -27,7 +27,7 @@ Abstract:
#include <IndustryStandard/Pci.h> #include <IndustryStandard/Pci.h>
#include <IndustryStandard/Acpi.h> #include <IndustryStandard/Acpi.h>
#include <IndustryStandard/Smbios.h> #include <IndustryStandard/SmBios.h>
#include <IndustryStandard/LegacyBiosMpTable.h> #include <IndustryStandard/LegacyBiosMpTable.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
@ -48,7 +48,7 @@ Abstract:
#include <Guid/Bmp.h> #include <Guid/Bmp.h>
#include <Guid/Acpi.h> #include <Guid/Acpi.h>
#include <Guid/Smbios.h> #include <Guid/SmBios.h>
#include <Guid/Mps.h> #include <Guid/Mps.h>
#include <Guid/HobList.h> #include <Guid/HobList.h>
#include <Guid/PciExpressBaseAddress.h> #include <Guid/PciExpressBaseAddress.h>

View File

@ -38,7 +38,6 @@
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Nt32Pkg/Nt32Pkg.dec
DuetPkg/DuetPkg.dec DuetPkg/DuetPkg.dec
[LibraryClasses] [LibraryClasses]

View File

@ -204,7 +204,7 @@ extern GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusCompon
extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding; extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding;
extern BOOLEAN gFullEnumeration; extern BOOLEAN gFullEnumeration;
static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFF; static UINT64 gAllOne = 0xFFFFFFFFFFFFFFFFULL;
static UINT64 gAllZero = 0; static UINT64 gAllZero = 0;
#include "PciIo.h" #include "PciIo.h"

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
EFI_STATUS EFI_STATUS

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
// //
// This device structure is serviced as a header. // This device structure is serviced as a header.

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "pcibus.h" #include "PciBus.h"
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
EFI_STATUS EFI_STATUS
PciEnumerator ( PciEnumerator (

View File

@ -44,4 +44,4 @@ Returns:
--*/ --*/
; ;
#endif #endif

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
EFI_STATUS EFI_STATUS
InitializePPB ( InitializePPB (

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
// //
// PCI I/O Support Function Prototypes // PCI I/O Support Function Prototypes

View File

@ -45,4 +45,4 @@ Returns:
--*/ --*/
; ;
#endif #endif

View File

@ -89,4 +89,4 @@ Returns:
--*/ --*/
; ;
#endif #endif

View File

@ -21,9 +21,10 @@ Revision History
--*/ --*/
#include "Pcibus.h" #include "PciBus.h"
EFI_STATUS EFI_STATUS
EFIAPI
ResetPowerManagementFeature ( ResetPowerManagementFeature (
IN PCI_IO_DEVICE *PciIoDevice IN PCI_IO_DEVICE *PciIoDevice
) )

View File

@ -45,4 +45,4 @@ Returns:
--*/ --*/
; ;
#endif #endif

View File

@ -21,7 +21,7 @@ Revision History
--*/ --*/
#include "pcibus.h" #include "PciBus.h"
typedef struct { typedef struct {
EFI_HANDLE ImageHandle; EFI_HANDLE ImageHandle;

View File

@ -479,7 +479,7 @@ CheckForRom (
Status = gBS->AllocatePool( Status = gBS->AllocatePool(
EfiBootServicesData, EfiBootServicesData,
((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR), ((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR),
&TempPciOptionRomDescriptors (VOID*)&TempPciOptionRomDescriptors
); );
if (mPciOptionRomTable.PciOptionRomCount > 0) { if (mPciOptionRomTable.PciOptionRomCount > 0) {
CopyMem( CopyMem(

View File

@ -52,13 +52,13 @@
DeviceIo.c DeviceIo.c
[Sources.ia32] [Sources.ia32]
ia32\PcatIo.c Ia32/PcatIo.c
[Sources.x64] [Sources.x64]
x64\PcatIo.c x64/PcatIo.c
[Sources.ipf] [Sources.ipf]
Ipf\PcatIo.c Ipf/PcatIo.c
[Protocols] [Protocols]
gEfiPciRootBridgeIoProtocolGuid gEfiPciRootBridgeIoProtocolGuid